Autogenerated HTML docs for v1.5.4-rc3-11-g4e67
diff --git a/git-rerere.html b/git-rerere.html index 80f498a..a380aa3 100644 --- a/git-rerere.html +++ b/git-rerere.html
@@ -284,6 +284,15 @@ automerge results and corresponding hand-resolve results on the initial manual merge, and later by noticing the same automerge results and applying the previously recorded hand resolution.</p> +<div class="admonitionblock"> +<table><tr> +<td class="icon"> +<div class="title">Note</div> +</td> +<td class="content">You need to set the configuration variable rerere.enabled to +enable this command.</td> +</tr></table> +</div> </div> <h2>COMMANDS</h2> <div class="sectionbody"> @@ -472,7 +481,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 07-Jan-2008 07:50:42 UTC +Last updated 15-Jan-2008 08:30:41 UTC </div> </div> </body>
